From c0806bf61d4850a0e70eeae24643190309b62b1e Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 2 May 2012 18:20:35 +0800 Subject: [PATCH] * src/xfns.c (x_window): Use xstrdup (Bug#11375). --- src/ChangeLog | 2 ++ src/xfns.c | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 62d990e4c95..d27dab7a02d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -2,6 +2,8 @@ * xterm.c (x_term_init): Use memcpy instead of strncpy (Bug#11373). + * xfns.c (x_window): Use xstrdup (Bug#11375). + 2012-05-02 Eli Zaretskii * xdisp.c (pos_visible_p): If already at a newline from the diff --git a/src/xfns.c b/src/xfns.c index df1b39b018f..510a66d6349 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -2439,7 +2439,6 @@ x_window (struct frame *f, long window_prompting, int minibuffer_only) /* Do some needed geometry management. */ { - ptrdiff_t len; char *tem, shell_position[sizeof "=x++" + 4 * INT_STRLEN_BOUND (int)]; Arg gal[10]; int gac = 0; @@ -2508,13 +2507,11 @@ x_window (struct frame *f, long window_prompting, int minibuffer_only) } } - len = strlen (shell_position) + 1; /* We don't free this because we don't know whether it is safe to free it while the frame exists. It isn't worth the trouble of arranging to free it when the frame is deleted. */ - tem = (char *) xmalloc (len); - strncpy (tem, shell_position, len); + tem = (char *) xstrdup (shell_position); XtSetArg (gal[gac], XtNgeometry, tem); gac++; XtSetValues (shell_widget, gal, gac); } -- 2.30.2